Some minor improvement to our File|Quit menu.
Merge branch 'master' into issue31