Conflict Travel actions get dropped after contrib
Merge branch 'master' of https://github.com/zinroc/zinrocfantasy