[MERGE] test and fix for commit with bad non-ascii messages (non-ascii chars that cannot be decoded with current user encoding)

[Bundle Buggy]

Bundle Buggy has detected this merge request.

For details, see: 
http://bundlebuggy.aaronbentley.com/request/%3C46F3AA12.2050606%40ukr.net%3E