Add changes of v0.6.21
Merge branch 'master' of github.com:serverspec/serverspec.github.io