Merge branch 'fixes-rc2' into omap-for-v4.6/fixes