Merge branch 'v2.0' 96/1696/1
authortierno <alfonso.tiernosepulveda@telefonica.com>
Wed, 26 Apr 2017 12:32:14 +0000 (14:32 +0200)
committertierno <alfonso.tiernosepulveda@telefonica.com>
Wed, 26 Apr 2017 12:32:14 +0000 (14:32 +0200)
Signed-off-by: tierno <alfonso.tiernosepulveda@telefonica.com>

Trivial merge