Merge branch 'master' into bump_v1.0.0

Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Bump to version v1.0.0
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Update windows.md

Replace "OS X" by "Windows"
Merge pull request #6302 from Costent/patch-1

Update windows.md
Merge pull request #6303 from crosbymichael/bump_v1.0.0

Bump version to v1.0.0
Merge branch 'release' into merge_release_v1.0.0

Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Change version to v1.0.0-dev
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Merge pull request #6305 from crosbymichael/merge_release_v1.0.0

Merge release v1.0.0