am d0b22902: Merge change I847e8ab8 into eclair

Merge commit 'd0b229025792977fe668cd636c7875d954b80b82' into eclair-mr2

* commit 'd0b229025792977fe668cd636c7875d954b80b82':
  Fix issue #2258571: Fix build versions