Merge branch 'omap-all' into devel