Merge branch 'master' of github.com:wolframschneider/openlayers into bbbike
Merge remote branch 'origin/bbbike' into bbbike