Merge remote branch 'sebastian/bug1238'