django 1.6 compat
Merge branch 'master' of https://github.com/ashwoods/django-officium