Merge branch 'v1.1' 72/1272/1
authorgarciadeblas <gerardo.garciadeblas@telefonica.com>
Fri, 10 Mar 2017 11:49:02 +0000 (12:49 +0100)
committergarciadeblas <gerardo.garciadeblas@telefonica.com>
Fri, 10 Mar 2017 11:49:02 +0000 (12:49 +0100)

Trivial merge