Merge pull request #8578 from erikh/fix_slash

builder: Handle trailing \ appropriately.