Replace satellite by hybrid base layer
Merge branch 'master' into gh-pages