Fix some broken imports that resulted from the merge.
Merge branch 'master' into production