[dali_1.2.54] Merge branch 'devel/master' 50/146250/1
authorFrancisco Santos <f1.santos@samsung.com>
Fri, 25 Aug 2017 10:49:46 +0000 (11:49 +0100)
committerFrancisco Santos <f1.santos@samsung.com>
Fri, 25 Aug 2017 10:49:46 +0000 (11:49 +0100)
Change-Id: I161c0e2e5bc243c65be2c29332b17392d432e786


Trivial merge