[dali_1.2.64] Merge branch 'devel/master' 66/158866/1
authorGyörgy Straub <g.straub@partner.samsung.com>
Fri, 3 Nov 2017 12:28:02 +0000 (12:28 +0000)
committerGyörgy Straub <g.straub@partner.samsung.com>
Fri, 3 Nov 2017 12:28:02 +0000 (12:28 +0000)
Change-Id: I96df6befa5aafdda6f2aacefc0ab132e7eabc512


Trivial merge