Attempted encoding fix: needs test on linux to see if this is partly a Win-only problem.
Merge branch 'HEAD' of https://github.com/aolieman/sigir-erd-14-server.git