Merge remote-tracking branch 'origin/5.5' 55/16055/1
Vincent COUVERT [Fri, 27 Feb 2015 10:41:08 +0000 (11:41 +0100)]
Change-Id: Ib4ef2af9b0c9a551fb90312a7b8216773ba08ede


Trivial merge