Merge remote-tracking branch 'chiiph/bug/versioneer_windows' into develop