[dali_1.2.38] Merge branch 'devel/master' 94/128094/1
authorAgnelo Vaz <agnelo.vaz@samsung.com>
Fri, 5 May 2017 09:52:53 +0000 (10:52 +0100)
committerAgnelo Vaz <agnelo.vaz@samsung.com>
Fri, 5 May 2017 09:52:53 +0000 (10:52 +0100)
Change-Id: I4607f4d44db2f987b005cc0288cc090c18113a39


Trivial merge