Merge branch 'xcos-layout' into 'master' 14/18814/1
Clément DAVID [Fri, 23 Dec 2016 07:39:03 +0000 (08:39 +0100)]
Change-Id: I2bbd8af8436092e61f521f1a06ebae02c6480f12


Trivial merge