- FIX for #10594 (more logical flow)
- FIX for #10594 (more logical flow)

chrisroberts/vagrant,bryson/vagrant,chrisroberts/vagrant,chrisroberts/vagrant,gitebra/vagrant,bryson/vagrant,mitchellh/vagrant,mitchellh/vagrant,gitebra/vagrant,gitebra/vagrant,mitchellh/vagrant,chrisroberts/vagrant,sni/vagrant,sni/vagrant,marxarelli/vagrant,sni/vagrant,mitchellh/vagrant,marxarelli/vagrant,gitebra/vagrant,bryson/vagrant,marxarelli/vagrant,marxarelli/vagrant,bryson/vagrant,sni/vagrant