simplify comparison
Merge remote-tracking branch 'origin/master'

Conflicts:
	djmoney/models/fields.py