errata corrige
Merge branch 'beta' into sebataz.ch