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


Trivial merge