Fix #1712 (issue when django-guardian is installed but not configured/used)
Merge remote-tracking branch 'reference/master'