[dali_1.2.30] Merge branch 'devel/master' 66/118466/1
authorDavid Steele <david.steele@samsung.com>
Fri, 10 Mar 2017 15:01:59 +0000 (15:01 +0000)
committerDavid Steele <david.steele@samsung.com>
Fri, 10 Mar 2017 15:01:59 +0000 (15:01 +0000)
Change-Id: I53d18f00c7a29e651ed9bdbb522a5fbf68e10986


Trivial merge