Merge branch 'devel-map-io' into omap-for-linus