Basic prep for subtree merge
Subtree merge of coreos/coreos-vagrant@b159ef1c6e8