[dali_1.2.27] Merge branch 'devel/master' 74/115374/1
authoradam.b <adam.b@samsung.com>
Fri, 17 Feb 2017 12:57:20 +0000 (12:57 +0000)
committeradam.b <adam.b@samsung.com>
Fri, 17 Feb 2017 12:57:20 +0000 (12:57 +0000)
Change-Id: I2c1267af49800d397c03891ab6502687ffa40b6c


Trivial merge