Merge branch 'master' into v1.1 79/1279/1
authorgarciadeblas <gerardo.garciadeblas@telefonica.com>
Fri, 10 Mar 2017 13:36:53 +0000 (14:36 +0100)
committergarciadeblas <gerardo.garciadeblas@telefonica.com>
Fri, 10 Mar 2017 13:36:53 +0000 (14:36 +0100)

Trivial merge