master standing merging two of separate jobs
Merge branch 'master' into ricpc