dependency housekeeping
Merge branch 'master' into export_fix