add missing import
add a regression test
fix another missing import
Merge pull request #2671 from gittip/fix-missing-import

Fix missing import