Merge branch 'master_merge_new-image' of /home/tur/git/u-boot