[dali_1.2.56] Merge branch 'devel/master' 64/148664/1
authoradam.b <adam.b@samsung.com>
Fri, 8 Sep 2017 08:28:29 +0000 (09:28 +0100)
committeradam.b <adam.b@samsung.com>
Fri, 8 Sep 2017 08:28:29 +0000 (09:28 +0100)
Change-Id: I961a184a0db84626a2007a1a33bf60f24310137e


Trivial merge