Merge branch 'release/0.17'
Fix for badly-formed content-disposition header.

Taken from https://github.com/mikel/mail/pull/602
Merge branch 'hotfix/0.17.0.1' into wdtk