[dali_1.2.21] Merge branch 'devel/master' 47/109047/1
authorAgnelo Vaz <agnelo.vaz@samsung.com>
Fri, 6 Jan 2017 14:01:50 +0000 (14:01 +0000)
committerAgnelo Vaz <agnelo.vaz@samsung.com>
Fri, 6 Jan 2017 14:01:50 +0000 (14:01 +0000)
Change-Id: I53d98a90483863158085cfaece8498bd7172b154


Trivial merge