Merge branch 'v2.0' 63/1863/1
authortierno <alfonso.tiernosepulveda@telefonica.com>
Wed, 24 May 2017 09:23:28 +0000 (11:23 +0200)
committertierno <alfonso.tiernosepulveda@telefonica.com>
Wed, 24 May 2017 09:23:28 +0000 (11:23 +0200)

Trivial merge