Merge all other contributions

New features
Fix Windows bugs
This is a backwards-incompatible change and we cannot do this.