Merge branch 'hotfix-2.2.25'
Update to the installation instructions, fixes #257
Merge branch 'hotfix-2.2.26' into develop