Merge branch '3.1.0-stable'

Conflicts:
	CHANGELOG.md
	lib/paper_trail.rb