tips
Merge remote-tracking branch 'upstream/master' into django-model-update
Update docstring to better describe the purpose of the field param
Clarified a "not in" condition
PEP8
PEP8
Combine a couple of tests