Feature 3435: Splitting up a large commit so it's less painful
Merge branch 'master' of https://github.com/mschwa/active-review