update to ol3 master