Merge pull request #1966 from flukeout/develop

Bringing a few components up to date: