Fix incorrect import causing a compilation error.
Merge branch 'master' into fixit