django1.4, copied from 1.3, untested yet