Started work on #303
Merge branch 'master' of github.com:WriggleNightbug/po-server-goodies into WriggleNightbug-master