Merge branch 'fixes-rc1' into omap-for-v4.3/fixes