Merge branch 'allocator-fixes' into for-linus-4.4