[webgl-point] Merge openlayers:master into the branch

This merges openlayers:master into the webgl-point branch.