Commits in ~bertram/mana/mana-equipment-fix:master