Compatible django 1.6+
Merge branch 'dev'