Merge "Add ability to rename a downloaded file." into nyc-dev
Ben Lin [Mon, 2 May 2016 22:54:20 +0000 (22:54 +0000)]

Trivial merge