wip
Merge branch 'SSEOM-1' of https://github.com/evandor/skysail-server-ext.git into SSEOM-1
Merge branch 'SSEOM-1' of https://github.com/evandor/skysail-server-ext.git into SSEOM-1