Merge remote-tracking branch 'origin/3.3' into 3.4

This commit is contained in:
Laurent Destailleur 2013-09-11 23:10:54 +02:00
commit 899c209468