Merge branch 'devel/master' into devel/new_mesh 18/42318/1
authorFrancisco Santos <f1.santos@samsung.com>
Thu, 25 Jun 2015 14:53:25 +0000 (15:53 +0100)
committerFrancisco Santos <f1.santos@samsung.com>
Thu, 25 Jun 2015 14:54:34 +0000 (15:54 +0100)
Change-Id: Ie51fa61a8ef7c904635b99c9bf39185c10efd2bf


Trivial merge