Merge "Merge branch '1.4-rel'"
authorPhil Coval <p.coval@samsung.com>
Fri, 25 May 2018 19:35:38 +0000 (19:35 +0000)
committerPhil Coval <p.coval@samsung.com>
Fri, 25 May 2018 19:35:38 +0000 (19:35 +0000)

Trivial merge