Small fixes, phonebook crash, mapgen issues
Merge pull request #7855 from vache/misc_fixes

Small fixes, phonebook crash, mapgen issues
Merge remote-tracking branch 'reverieAlice/master' into FrankenMod