Merge branch 'upstream/3.4'
Fix for language
Fix problem field
Update ChangeLog
Merge pull request #1301 from aspangaro/3.4

Fix 3.4