Merge mainline/master into arm/fixes