Updating ol.js to latest from master