DEV-31908: Handle custom file downloads
Merge pull request #1 from marketboomer/master_danny

DEV-31908: Handle custom file downloads