Add support for 'charset' property for multipart boundaries

- Fixes #2004