Remove protocol from URLs
Merged with upstream, updated resources base URLs
Merge branch 'master' into dev