tree e9a7e8eed9a7e5239b31f324132e45af1c0b9a08
parent f435b4e3b34e2a240ef48e52f2c06cc890a5204c
parent abf19e9c5937b315a71432fdf6bf064d51b35c07
author Alois Zoitl <alois.zoitl@gmx.at> 1586342276 +0200
committer Alois Zoitl <alois.zoitl@gmx.at> 1586342276 +0200

Merge branch '1.12.x' into master for the 1.12.0 release!

Change-Id: I431fd0beacc247de5d566fc9313bf64db28bb6e9