Update import to correct path for Django 1.4->1.6 compatibility
Merge branch 'master' into dev