Delete .gitmodules
Merge branch 'master' into windows