Remco django166

Merge together with the rest