The commit before I get James' changes.
Merge branch 'master' of https://github.com/jmuyskens/moderate