[dali_1.2.64] Merge branch 'devel/master' 65/158865/1
authorGyörgy Straub <g.straub@partner.samsung.com>
Fri, 3 Nov 2017 12:27:45 +0000 (12:27 +0000)
committerGyörgy Straub <g.straub@partner.samsung.com>
Fri, 3 Nov 2017 12:27:45 +0000 (12:27 +0000)
Change-Id: I441e187bb544c99a44836ed237733f1134c52dba


Trivial merge