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


Trivial merge