Dropbox fix rebased with additional fix

This PR is a rebase of #424 with an additional commit to fix a broken link from a develop-only file and add in a link which was missing in another FS file. It replaces #425 and doesn't need to be rebased after merging.