Merge branch 'field-zeroing' into for-linus