windows git bug
Merge branch 'master' into staging
Revert "windows git bug"

This reverts commit 6e94ff3d7ec352720b6442c8452725c6af7fd008.