rfc compliant user agent; fix bug #67528
Merge branch 'R_2_0'