Merge "Have ?download parameter trigger Content-Disposition: attachment"