Fix bugs in clans
Merge branch 'hispano-base' into hispano