Merge branch 'release/1.6.1a2' into develop
Don't encode '+' in links.
Add some missing changes to the change log.
Update version for beta.
Merge branch 'release/1.6.1b1'