Merge branch 'contrib'