update to current ol3 master