dos2unix conversion for a number of files; this avoids spurious conflicts when merging to master
remove now-unnecessary wrappers from Type interface
Merge branch '1.0.x'