Merge up to master from stable after modsync changes#165

Merged

glennsarti merged 4 commits intopuppetlabs:masterfrom

ferventcoder:master

Apr 29, 2016

Commits on Apr 13, 2016

Merge branch 'master' into stable
glennsarti
committed

Commits on Apr 29, 2016