Merge "Merge branch '1.4-rel' (455c136)"
authorPhil Coval <p.coval@samsung.com>
Thu, 20 Sep 2018 09:26:55 +0000 (09:26 +0000)
committerPhil Coval <p.coval@samsung.com>
Thu, 20 Sep 2018 09:26:55 +0000 (09:26 +0000)

Trivial merge