Merge remote-tracking branch 'origin/master' into newsfeed 21/17521/1 newsfeed
Antoine ELIAS [Tue, 1 Dec 2015 15:21:42 +0000 (16:21 +0100)]
Change-Id: I94aa03482db14ef1c81d1e51f957ba3bf6c36a4e


Trivial merge