Fix warning messages on cray
Merge branch 'master' into contains