[dali_1.3.22] Merge branch 'devel/master' 73/177373/1
authorAgnelo Vaz <agnelo.vaz@samsung.com>
Fri, 27 Apr 2018 11:05:53 +0000 (12:05 +0100)
committerAgnelo Vaz <agnelo.vaz@samsung.com>
Fri, 27 Apr 2018 11:05:53 +0000 (12:05 +0100)
Change-Id: I891d65cc738e0e5fd233ac9dfad398646aec68ac


Trivial merge