Merge branch 'stm2-fix_block_movement'
Merge branch 'master' of github.com:eressea/server