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)
commite5ce4ffee708ce25521d0a95280c25904ab94ddd
treeeb2b48fd2ada4c592cab5a2d6493aeb6a5aa85b2
parentf22a6845feac83432bce632a7a82b7fc4081df25
parentf6914d7d8e3153683139096480a86afec5b07302
Merge branch 'master' into v1.0

Change-Id: I28c3c3aa0fd936afdb610632836dee9b07f94b08
Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>