Certification of maps/layers
Certification tweaks
Bug fixes relating to certification
Merge branch 'cert'