Django 1.6 compatibility fixes (import location changes)

Django 1.6 compatibility fixes
Merge commit '1898359c59'