Merge remote branch 'sebastian/bug2450' into maint-0.2.2