manual merge of Peter's heraldry translation