K 10 svn:author V 8 rmacklem K 8 svn:date V 27 2017-07-30T21:57:19.490635Z K 7 svn:log V 77 Manually merge in r321675, so I don't need to wait for the MFC to stable/11. END