Wiki now automatically adds/removes a trailing 's' on queries, a basic form of autocorrect.
Merge branch 'master' into ubuntu-i386