Merge remote-tracking branch 'origin/master' into YaSp 94/16094/1
Vincent COUVERT [Wed, 4 Mar 2015 14:09:20 +0000 (15:09 +0100)]
Change-Id: I281855fd0307e4819efe70bf33c4520812c05ba7


Trivial merge