Use ol3 master again

Note: Please merge only after @oterral changes are included into ol3 master.