Merge branch 'dev-replace-fixes-4.7' of git://git.kernel.org/pub/scm/linux/kernel...