Reapplied still-needed Django patches atop 1.6.1 release