Merge remote-tracking branch 'origin/pr/2686' into mbedtls-2.18

* origin/pr/2686:
  Update library version to 2.18.0