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