Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/reversion/models.py
	src/reversion/revisions.py
	src/reversion/version.py
fixed imports
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/reversion/models.py
	src/reversion/revisions.py
	src/reversion/version.py