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


Trivial merge