Make sure resource are loaded with the correct protocol
Testing the new Docker stack of Travis-CI
Reverting Travis stuff
Merge remote-tracking branch 'origin/master'
Merge branch 'master' into dox-45