- combine on layout
- fix 2011
Merge branch 'master' of https://github.com/pol0nium/geomark