edition to editions
Merge branch 'feature/moar' into develop