Fix the tests after merging the 1.4 branch
Merge pull request #1010 from camptocamp/fix-merge

Fix the tests after merging the 1.4 branch