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


Trivial merge