grammar; i think
bundle
Merge pull request #113 from jstrimpel/master

bundled
Merge remote-tracking branch 'upstream/master' into intern
more server unit tests converted