Fix bad merge in test-push
Merge branch 'master' of https://github.com/oaeproject/Hilary