Automatic merge of 'for-linus' branch from