Merge branches 'sh/highmem' and 'sh/stable-updates'