Trunk

https://issues.apache.org/jira/browse/HTTPCORE-390