fix build system
Merge branch 'master' of https://github.com/enketo/enketo into production