Fixup missing provider ID in import
Don't try to upgrade if url is not a string
Merge branch 'master' of github.com:e14n/pump.io
Merge remote-tracking branch 'upstream/master'