Merge pull request #2114 from Smooey/master
authorAlexander Ebert <ebert@woltlab.com>
Tue, 11 Oct 2016 16:58:03 +0000 (18:58 +0200)
committerGitHub <noreply@github.com>
Tue, 11 Oct 2016 16:58:03 +0000 (18:58 +0200)
A couple English "bug fixes" to merge...


Trivial merge