Merge commit 'v3.1-rc1' into imx-fixes