Remove mark after trimming trailing whitespace.
Merge branch 'master' of ssh://github.com/zeekay/vice-standard-issue