Merge branch 'master' into tnguyen/qite
Signed-off-by:
Thien Nguyen <nguyentm@ornl.gov>
# Conflicts:
# quantum/plugins/algorithms/CMakeLists.txt
Signed-off-by:
Thien Nguyen <nguyentm@ornl.gov>
# Conflicts:
# quantum/plugins/algorithms/CMakeLists.txt