Add RFC 2231 support. Thanks to Piotr Pawlow. (#2501379)