Nag Nanny, fixes #364 (win)
Merge branch 'master' into builds
7.864