Updated contrib versions.
Merge branch 'develop'