Merge branch 'maint-0.2.7-redux' into release-0.2.7-redux