Merge branch 'master' into master

Author: nonhermitian

azure-pipelines.yml

@@ -38,7 +38,7 @@ steps:
     source /tmp/docs_build/bin/activate
     pip install -U qiskit jupyter sphinx nbsphinx sphinx_rtd_theme
     pip install 'matplotlib<3.3'
-    pip install -U qiskit-terra[visualization] cvxpy
+    pip install -U qiskit[visualization] cvxpy
     sudo apt-get install -y pandoc graphviz
   displayName: 'Install dependencies'
 - bash: |