Merge "Merge branch '1.3-rel'"
authorPhil Coval <philippe.coval@osg.samsung.com>
Thu, 8 Feb 2018 13:05:37 +0000 (13:05 +0000)
committerPhil Coval <philippe.coval@osg.samsung.com>
Thu, 8 Feb 2018 13:05:37 +0000 (13:05 +0000)

Trivial merge