Merge "Merge branch '1.4-rel' (01fd9ec)"
authorPhil Coval <p.coval@samsung.com>
Mon, 4 Jun 2018 08:08:57 +0000 (08:08 +0000)
committerPhil Coval <p.coval@samsung.com>
Mon, 4 Jun 2018 08:08:57 +0000 (08:08 +0000)

Trivial merge