Remco django166

Changes for Django 1.6.6