Dixing import stub NPE
Merge remote-tracking branch 'upstream/master' into teambuilder
Importing WIP
Merge pull request #35 from TeToNN/teambuilder

Fixing import stub NPE