[dali_1.2.2] Merge branch 'devel/master' 82/84582/1
authorFerran Sole <ferran.sole@samsung.com>
Fri, 19 Aug 2016 10:00:17 +0000 (11:00 +0100)
committerFerran Sole <ferran.sole@samsung.com>
Fri, 19 Aug 2016 10:00:17 +0000 (11:00 +0100)
Change-Id: I8982dceee284d864344c379961665b52f3980bfc


Trivial merge