Merge branch 'for-4.3/microsoft' into for-linus