do not send random junk over imsg, it does not end well
Merge branch 'master' into portable