tree 7a1b03a041f1b461f9073e5ac16b65b7bb966eba
parent 4009b013e0a28d1764588171513694b744bf790d
parent fe38155761515663892c4af095a6e8a22e06e1f6
author Alois Zoitl <alois.zoitl@gmx.at> 1593536931 +0200
committer Alois Zoitl <alois.zoitl@gmx.at> 1593536931 +0200

Merge branch '1.12.x' into develop

Change-Id: I64d4e867820e18a16ff7f4497428af16025d3033