Mods only.
Merge branch 'updated' of https://github.com/xaviorm/Xavserver1.7 into updated-mods