Merge remote-tracking branch 'origin/5.5' 91/15891/1
Vincent COUVERT [Fri, 30 Jan 2015 15:37:29 +0000 (16:37 +0100)]
Change-Id: I3c04f36854c5afe5c56b6cf664e6201aeca6ac5b


Trivial merge