[dali_1.2.27] Merge branch 'devel/master' 73/115373/1
authoradam.b <adam.b@samsung.com>
Fri, 17 Feb 2017 12:57:01 +0000 (12:57 +0000)
committeradam.b <adam.b@samsung.com>
Fri, 17 Feb 2017 12:57:02 +0000 (12:57 +0000)
Change-Id: I668f5e6dd5f34e22684653e814e1204483fe86bf


Trivial merge