Merge branch 'ext/cmason/fix-dirty-writes' into for-next-stale-20190409