Added fallback to non-django six for django 1.4.1
merge conflict