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