am 79ed989a: Merge "Remove version-script option"

* commit '79ed989a02ece9f75807f05c9e1b01d1b7549e7b':
  Remove version-script option