Merge remote-tracking branch 'origin/5.5' 71/16571/1
Vincent COUVERT [Tue, 2 Jun 2015 07:58:06 +0000 (09:58 +0200)]
Change-Id: I229c7b1c948afb34dd944f0380c2dc25bd72c67b


Trivial merge