Switch to https api
Merge remote branch 'origin/dev'
Finish up https migration
Merge remote branch 'origin/dev'