Merge branch '1.9-maint' into 2.0-maint
Merge remote-tracking branch 'upstream/2.0-maint' into 2.1-maint
Merge pull request #3138 from davidegrohmann/merge-2.0-into-2.1

Merge 2.0 into 2.1