the tests should fail on the build server
Merge branch 'master' of https://github.com/mpws2013n1/postgres