This file is used only by the server test suite, should go there.
Merge branch 'master' into develop
Version 0.7.11
Merge branch 'develop'