Fix rebase after offline merge, ol3 update:
https://github.com/openlayers/ol3/commit/5416badde15d8f756a5ea9b478594cb140834e98