Merge commit 'b8c93646fd5c' into omap-for-v4.3/fixes