Merge branch 'v2.0' 98/1698/1
authortierno <alfonso.tiernosepulveda@telefonica.com>
Wed, 26 Apr 2017 13:06:04 +0000 (15:06 +0200)
committertierno <alfonso.tiernosepulveda@telefonica.com>
Wed, 26 Apr 2017 13:06:04 +0000 (15:06 +0200)
Signed-off-by: tierno <alfonso.tiernosepulveda@telefonica.com>

Trivial merge