More diplo changes
Nothing
Merge branch 'master' of https://github.com/cjeffery/sworsorc