Merge branch 'rfc2616' into switch