Merge pull request #3585 from lateralusX/jlorenss/win-counter-warning