Import 1.0.1e source
Merge branch 'upstream' into CoApp
adjusted for new AutoPackage syntax