Merge pull request #27 from aspangaro/3.4

Fix
Merge branch 'upstream/3.4'