Merge branch 'master' of https://github.com/spapas/wagtail into spapas-master
Merge branch 'i18n' of https://github.com/spapas/wagtail into spapas-i18n