code review changes
Merge branch 'master' of github.com:eressea/server