Merge pull request #2713 from alex/silence-warning

Fixes #2710 -- silence a deprecation warning.