Merge "Don't percent-encode HTML5 IDs"