wip
Merge branch 'SERVER-25' of https://github.com/evandor/skysail into SERVER-25
wip