Fixing #840 (vagrant-trouble)
Merge pull request #842 from leider/master

Fixing #840 (vagrant-trouble)