fixes
fixes
Merge pull request #21 from pmorie/dev/distributed-upgrades

Dev/distributed upgrades