Merge branch 'master' into dynamic_procedure_library
authorEduardo Ramos Testillano <eduardo.ramos.testillano@ericsson.com>
Sat, 22 Oct 2016 19:00:42 +0000 (21:00 +0200)
committerEduardo Ramos Testillano <eduardo.ramos.testillano@ericsson.com>
Sat, 22 Oct 2016 19:00:42 +0000 (21:00 +0200)

Trivial merge