Merge branch 'upstream/3.4'
Petites corrections
Merge pull request #22 from aspangaro/3.4

Petites corrections