Use the content disposition filename for download if there is one.

Fixes #2407