Synchronize with modulesync
Merge pull request #124 from cmurphy/master

Synchronize with modulesync