Merge release/2.5.1 onto develop

As well as these READMEs.