Grant McNaughton

#1294690

@telters