Fix building with 2.064.2.
Merge branch 'Fixup'