[dali_1.1.33] Merge branch 'devel/master' 82/68582/1
authorDavid Steele <david.steele@samsung.com>
Fri, 6 May 2016 14:48:07 +0000 (15:48 +0100)
committerDavid Steele <david.steele@samsung.com>
Fri, 6 May 2016 14:48:07 +0000 (15:48 +0100)
Change-Id: I27d1470273853b185a74936736052d543ccfbb0e


Trivial merge