am 26542574: am 8feaa2b6: am d0b22902: Merge change I847e8ab8 into eclair

Merge commit '265425746b50ddb14467b2bdbd62f3424b7176f0'

* commit '265425746b50ddb14467b2bdbd62f3424b7176f0':
  Fix issue #2258571: Fix build versions