errata
Merge branch 'gela-d.errata' into v2