Merge branch 'master' into peter
Merged Python files to correct versions as per the discussion between
Peter and I. :-)
Merge remote-tracking branch 'origin/peter' into feature_greenleaf