Fix merge 1.4 branch
Merge pull request #953 from camptocamp/fix-tests

Fix merge 1.4 branch