Merge unstable branch 'omap-rmk'

Merge branch 'omap-rmk' into omap-all