Note Sphinx docs issue was backported
Merge branch '1.10' into 1.11
Merge branch '1.11' into 1.12