Fix obsolete variable
Merge branch 'hotfix1'
Merge branch 'master' into gh-pages