[dali_1.2.13] Merge branch 'devel/master' 68/95768/1
authorTom Robinson <tom.robinson@samsung.com>
Fri, 4 Nov 2016 13:15:49 +0000 (13:15 +0000)
committerTom Robinson <tom.robinson@samsung.com>
Fri, 4 Nov 2016 13:15:50 +0000 (13:15 +0000)
Change-Id: I0d21dc8d5e9ea46271403676ae22fd1359738a50


Trivial merge