Merge Linus' latest into master