Make sure six>=1.7 is installed
Merge branch 'wagtail-0.7' into staging