comet not loadable in gemstone
Merge branch 'master' into gemstone3.1

* master:
  comet not loadable in gemstone