Rollback to the last stable version because Git merged in the wrong direction (thanks for that btw)
More files that got overwritten when Tortoise merged the wrong direction.
Merge branch 'master' into nextversion