worked on #1251 and #1188 (feel free to test and report it)
Fixed #1286
re-added MESSAGE_WALKAWAY
Fixed #764
minor
Merge pull request #1285 from EPuncker/master

worked on #1251 and #1188 (feel free to test and report it)