Merge branch '1.3-rel' (f51f0e11) 71/20171/2
authorPhilippe Coval <philippe.coval@osg.samsung.com>
Tue, 6 Jun 2017 07:53:00 +0000 (09:53 +0200)
committerPhilippe Coval <philippe.coval@osg.samsung.com>
Tue, 6 Jun 2017 07:54:32 +0000 (09:54 +0200)
Change-Id: I7ac5eb3b513625a7db49a16fd368f8db71ee915e
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>

Trivial merge