Merge "Merge branch '1.3-rel' (95fd9f5b)"
authorPhilippe Coval <philippe.coval@osg.samsung.com>
Fri, 16 Jun 2017 09:27:33 +0000 (09:27 +0000)
committerGerrit Code Review <gerrit@172.30.200.205>
Fri, 16 Jun 2017 09:27:33 +0000 (09:27 +0000)

Trivial merge