Merge master and update ol
https://github.com/openlayers/ol3/commit/ed5b8b651214895450e57d376de30a6bede5e932