release-2.0

Nadine Wieters

@nwieters

5bc10cad · Merge branch 'cherry-pick-f134b1bb' into 'release' · Jul 26, 2019

Tag before switching to release 3.