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