Merge branch 'v1' into es17.01

# Conflicts:
#	library/text/parser/uri_template/uri_template-safe.ecf
#	library/text/parser/uri_template/uri_template.ecf

library/server/authentication/http_authorization/src/http_authorization.e

@@ -137,7 +137,7 @@ feature -- Status report
 			-- String that should be displayed in debugger to represent `Current'.
 		do
 			create Result.make_empty
-			Result.append (type)
+			Result.append_string_general (type)
 			Result.append (" ")
 			if attached login as l_login then
 				Result.append ("login=[")