server updates
Merge branch 'unstable' of https://github.com/cybafelo/dark-matter into unstable