Merge pull request #2153 from Tom-Ski/master

Dont run afterEclipseImport if no desktop project, resolves #2134
Im a noob, fix version comparison
Merge remote-tracking branch 'upstream/master'