Diff for jrhoades (Commits: 4d1c88, 3aa7f6, Maintaining associations for 'DOWNLOAD' )