Merge branch 'master' into tyler/mmd_loss

2 jobs for xacc-devel in 4 minutes and 30 seconds (queued for 3 minutes and 50 seconds)
Status Name Job ID Coverage
  Build
passed docker build_devel #273238

00:04:30

failed docker build_devel #273237

00:03:37