Merge branch 'clotilde-0.2.0-beta'