Simpler prefixes
Merge branch 'v0.10' into generators