Issue #8200 by tj, added flag tables
Merge branch 'development' of github.com:aakb/vagrant into development