[dali_1.3.0] Merge branch 'devel/master' 12/160712/1
authoradam.b <adam.b@samsung.com>
Fri, 17 Nov 2017 14:46:41 +0000 (14:46 +0000)
committeradam.b <adam.b@samsung.com>
Fri, 17 Nov 2017 14:46:41 +0000 (14:46 +0000)
Change-Id: Ibce5535c5a9186010a59a0763645bd39faf7c40f


Trivial merge