Merge branch 'v2.0' 67/2167/1 v3.0.0 v3.0.0rc v3.0.0rc16 v3.0.0rc17 v3.0.0rc2 v3.0.1
authortierno <alfonso.tiernosepulveda@telefonica.com>
Wed, 13 Sep 2017 12:10:56 +0000 (14:10 +0200)
committertierno <alfonso.tiernosepulveda@telefonica.com>
Wed, 13 Sep 2017 12:10:56 +0000 (14:10 +0200)

Trivial merge