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


Trivial merge