Hopefully fix some Ajax issues in tests
Merge branch 'master' into coveralls