document new options from last commit
small adjustment to last commit
Merge branch 'master' into develop
changelog
Merge branch 'develop'
9.4beta6