testing develop merge

Adam Feketerequested to merge
develop into staging

It also avoids updating blas, lapcak and other libraries that are used in sisso

Merge request reports