use only internal providers
solve trailing slash issues
Merge remote-tracking branch 'remotes/origin/master'