Some performance bug fixes for OpenMP and hybrid scaling
Merge branch 'master' of https://github.com/meistero/Samoa