Merge branch 'maint-0.4.2' into maint-0.4.3