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