Merge the Master PR stuff and the Download Link Fix