Tidy occupantswin.c
Merge branch 'master' into plugins