[dali_1.2.36] Merge branch 'devel/master' 49/126449/1
authoradam.b <adam.b@samsung.com>
Fri, 21 Apr 2017 11:30:24 +0000 (12:30 +0100)
committeradam.b <adam.b@samsung.com>
Fri, 21 Apr 2017 11:30:24 +0000 (12:30 +0100)
Change-Id: Ie447fbc406ebd3c601e256678aab7227347477b4


Trivial merge