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

Trivial merge