chore(*): pull in upstream changes
Merge branch 'master' of github.com:coreos/coreos-web