Merge remote-tracking branch 'origin/vs2012' 77/12277/1
Antoine ELIAS [Tue, 13 Aug 2013 18:56:43 +0000 (20:56 +0200)]
Change-Id: I184e3415eeeb4660ac8aea44037ca441ca493b16


Trivial merge