Merge branch 'devel/master' into devel/new_mesh 79/42379/1
authorFrancisco Santos <f1.santos@samsung.com>
Fri, 26 Jun 2015 14:00:14 +0000 (15:00 +0100)
committerFrancisco Santos <f1.santos@samsung.com>
Fri, 26 Jun 2015 14:02:22 +0000 (15:02 +0100)
Change-Id: Ibaa203f8ccb1e3526faac8b168440c7a41ec6c69


Trivial merge