Merge branch 'master' into hpc2