[dali_1.1.41] Merge branch 'devel/master' 21/77921/1
authoradam.b <adam.b@samsung.com>
Fri, 1 Jul 2016 13:29:11 +0000 (14:29 +0100)
committeradam.b <adam.b@samsung.com>
Fri, 1 Jul 2016 13:29:11 +0000 (14:29 +0100)
Change-Id: Ie6f8e0ce0ac6f418701171963393e01e49cc0e21


Trivial merge