Merge commit 'u-boot/master' into for-1.3.1