Merge with git+ssh://sr@pollux.denx.org/home/wd/git/u-boot/from_stefan