Django 1.5/1.6 compatibility
Merge branch 'master' of https://github.com/hyperkitty/hyperkitty