Completed manual merge of PR #68, props to @drlippman.
Merge branch 'drlippman-import_meta_update' into dev