- fix comet in gemstone
- bugfix for slime tests
Merge branch 'master' into gemstone3.1

* master:
  - fix comet in gemstone - bugfix for slime tests

Conflicts:
	tests/testTravisCI.sh