Merge remote-tracking branch 'origin/3.5' into develop

This commit is contained in:
Laurent Destailleur 2013-11-28 18:57:43 +01:00
commit ea51e9ec77