rewrite history to improve two changelog entries
Merge branch 'maint-0.2.4'