Contrib module upgrades.
Merge pull request #46 from kenorb/master

Contrib module upgrades.