Merge pull request #1529 from martinbudden/bf_trailing_spaces2