Merge pull request #1279 from aparcar/fix_slash