Merge branch 'master' into susygrid-temp