Django 1.5 fixes - to merge onto real 1.5 branch