Fix snapshot not working under Django 1.7c1
Merge branch 'feature/fix-snapshot-django17' into develop