[dali_1.2.60] Merge branch 'devel/master' 39/154139/1
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 6 Oct 2017 15:55:23 +0000 (16:55 +0100)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 6 Oct 2017 15:55:23 +0000 (16:55 +0100)
Change-Id: I2994fa2040564870d0ef207f388c2cdb48acb09b


Trivial merge