Merge remote branch 'contrib/devel2' into devel