Contrib modules updated
Merge branch 'contrib-updates'