can.stache import support
Merge branch 'stache-import-support' into gthrive