Bugfix in  mass import script
Merge branch 'my'