Merge branch 'hotfix-0.94.3'
Merge branch 'master' of https://github.com/jtriley/StarCluster into develop