Merge remote-tracking branch 'origin/slint-cnes' 15/18015/1
Antoine ELIAS [Wed, 30 Mar 2016 14:43:02 +0000 (16:43 +0200)]
Change-Id: Iffdd5e66de1357c495fd1399778cc58892ccb3a6


Trivial merge