iii
Revert "iii"

This reverts commit 8f427c05b64c91ac9708ec882c70f2aa38ed128c.
Merge branch 'master' of github.com:efoft/puppet
Merge branch 'master' of github.com:efoft/puppet
Merge branch 'master' of github.com:efoft/puppet
Merge branch 'master' of github.com:efoft/puppet
Merge branch 'master' of github.com:efoft/puppet
Merge branch 'master' of github.com:efoft/puppet
correctly escaped win pathes