Merge pull request #1336 from jamezp/component-upgrades

Upgrade components to their latest versions.