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

* commit '6eac5c772c7c5703c6b7a38963427cec1bec0ac5':
  Remove version-script option