Merge remote-tracking branch 'origin/master' into similan 62/12262/1
Antoine ELIAS [Mon, 12 Aug 2013 13:51:40 +0000 (15:51 +0200)]
Change-Id: Ib6886d1a2be2880fa6e95f7f9e493307ca6b7a50


Trivial merge