Django15support - Fixes for usages with Django 1.5+ only