Merge wagtail v0.4.1