Bugfix on importing groups
Merge branch 'master' into vagrant