Merge branch 'release-1.8.4'
Bumps version number.
Update changelog
Merge branch 'release-1.8.5'
Merge branch 'master' into release-1.8.5
Merge branch 'release-1.8.5' into develop