ChangeLog  Tidied up and added some more information
Merge branch 'file_tidy' into develop
Merge branch 'develop' into release-3.0.1
Merge branch 'release-3.0.1'