[dali_1.3.0] Merge branch 'devel/master' 14/160714/1
authoradam.b <adam.b@samsung.com>
Fri, 17 Nov 2017 14:47:03 +0000 (14:47 +0000)
committeradam.b <adam.b@samsung.com>
Fri, 17 Nov 2017 14:47:03 +0000 (14:47 +0000)
Change-Id: I27fa89066cc4c79e784a7a4748b28c84171937c8


Trivial merge