Merge branch 'master' into development

Preparatory merge to bring master branch changes into development,
prior to merging the (up to date) development branch back on to master
so that the master branch reflects the new interface.