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)