[dali_1.3.12] Merge branch 'devel/master' 77/170277/1
authorDavid Steele <david.steele@samsung.com>
Fri, 16 Feb 2018 13:56:27 +0000 (13:56 +0000)
committerDavid Steele <david.steele@samsung.com>
Fri, 16 Feb 2018 13:56:27 +0000 (13:56 +0000)
Change-Id: I5170d7621702dda7591535de0110f1a2d3b785cb


Trivial merge