Merge branch 'rnou/spack' into 'master'