Proposed batch of changes for release 0.2.2 - see Changes.txt for defect list