Merge branch 'support_for_gs-oolite-v1'