Reviewed-by: darcy, weijun
Update the spec and code to accept '+' as a charset name character Reviewed-by: alanb