Merge branch 'master' of https://code.ornl.gov/qci/qcor

2 jobs for master in 6 minutes and 43 seconds (queued for 1 second)