Merge "Merge branch '1.4-rel' (44ce6a7) aka 2.0.0"
authorPhil Coval <p.coval@samsung.com>
Mon, 20 Aug 2018 17:17:35 +0000 (17:17 +0000)
committerPhil Coval <p.coval@samsung.com>
Mon, 20 Aug 2018 17:17:35 +0000 (17:17 +0000)

Trivial merge