Merge pull request #1231 from colincross/canon_perftest_fix

Fix build in canon_perftest_fix