turn back on all of the platform/versions
Merge branch 'dev'
no need to extend FileStream for GemStone