Build #380:   Merge branch 'master' into fileoperations on branch master about 10 years ago