Merge branch 'master' of github.com:torchbox/wagtail into docs
placeholders added
bleh that merge sucked