Fix build. Forgot to add this file in c305dba.

Apologies to any future git bisect-ers
Merge remote-tracking branch 'upstream/master'