Merge branch 'master' into u-boot-5329-early