Update ol3 to latest from master