[dali_1.3.28] Merge branch 'devel/master' 43/181143/1
authorGyörgy Straub <g.straub@partner.samsung.com>
Fri, 8 Jun 2018 10:50:52 +0000 (11:50 +0100)
committerGyörgy Straub <g.straub@partner.samsung.com>
Fri, 8 Jun 2018 10:50:52 +0000 (11:50 +0100)
Change-Id: I7c8e44e485ed3bb8b3a5c38077e3144864a50dbe


Trivial merge