Merge branch 'cleanups/assorted' into imx-fixes-for-arnd