[dali_1.2.13] Merge branch 'devel/master' 69/95769/1
authorTom Robinson <tom.robinson@samsung.com>
Fri, 4 Nov 2016 13:16:23 +0000 (13:16 +0000)
committerTom Robinson <tom.robinson@samsung.com>
Fri, 4 Nov 2016 13:16:23 +0000 (13:16 +0000)
Change-Id: I017c9464846bd58c93d8a2fad3852c4354710d19


Trivial merge