fixes https://github.com/torchbox/wagtail/issues/564
Merge branch 'nosouth' into tng_dev