Merge branches 'master', 'omap1-upstream' and 'orion' into devel