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

This commit is contained in:
Laurent Destailleur 2014-08-06 10:52:57 +02:00
parent 098c5febd5
commit 338c4543fc

File diff suppressed because one or more lines are too long