[dali_1.2.8] Merge branch 'devel/master' 81/90581/1
authoradam.b <adam.b@samsung.com>
Fri, 30 Sep 2016 14:12:12 +0000 (15:12 +0100)
committeradam.b <adam.b@samsung.com>
Fri, 30 Sep 2016 14:12:12 +0000 (15:12 +0100)
Change-Id: Ia7505e1fe07deca1992f8a1688ad9f2cd4587978


Trivial merge