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


Trivial merge