Merge branch 'master' into v1.0 66/566/1
authorgarciadeblas <gerardo.garciadeblas@telefonica.com>
Sat, 22 Oct 2016 09:18:35 +0000 (11:18 +0200)
committergarciadeblas <gerardo.garciadeblas@telefonica.com>
Sat, 22 Oct 2016 09:19:26 +0000 (11:19 +0200)
Change-Id: I28c3c3aa0fd936afdb610632836dee9b07f94b08
Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>

Trivial merge