Merge stable into master#3457

Merged

max-sixty merged 2 commits intomasterfrom

Oct 29, 2019

Commits on Oct 14, 2019

Typo correction in docs (#3387)

christophcc
authored and
Joseph Hamman
committed

Commits on Oct 29, 2019

Update terminology.rst (#3455)

amcnicho
authored and
max-sixty
committed