Merge branch 'master' into v2.0 29/1629/1
authorgarciadeblas <gerardo.garciadeblas@telefonica.com>
Fri, 21 Apr 2017 12:18:06 +0000 (14:18 +0200)
committergarciadeblas <gerardo.garciadeblas@telefonica.com>
Fri, 21 Apr 2017 12:18:06 +0000 (14:18 +0200)

Trivial merge