Merge branch 'omap1' into ams-delta