django 1.6 compat, take 2