and not AND
Merge branch 'master' of git://github.com/modulargaming/forum