Merge remote-tracking branch 'omap/for-next'