merge from trunk: these open layers resources were not committed!
View revisions
Also available in: Atom