second try at correct remote urls
Merge branch 'develop'

* develop:
  second try at correct remote urls