Merge with git+ssh://fifi/home/wd/git/u-boot/master