Merge pull request #988 from nico/slashes