IN/OUT administrator  'merge anibal:angel' - ref BT#8566

Commits merges (angel, anibal)
Please avoid making space of character enconding changes to lines in the same commit as one introducing new terms.