Include missing header, pacify recent pyflakes
Merge branch 'master' into loom