Issue 589 was backported to 4.0.1
Issue 589 was backported to 4.0.1

[ci skip]

airblade/paper_trail,jnstq/paper_trail,theRealNG/paper_trail,ifeelgoods/paper_trail,theRealNG/paper_trail,devonestes/paper_trail,airblade/paper_trail,jnstq/paper_trail,ifeelgoods/paper_trail