Merge "Don't add a '/' if it's already there."