Avoid duplicate code in different server versions
Merge branch 'master' of github.com:malariagen/DQXServer