Django 1.7 #660
Django 1.7 #660
update for use with other apps