Merge "Trailing '/' throws error"