Merge branch 'contrib' into 'master'