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


Trivial merge