Merge pull request #671 from jay-hodgson/release-20

SWC-1020: block those who do not have direct upload capability, and fix Safari
fix npe