Merge branch 'master' of github.com/coreos/coreos-overlay into baselayout