am 63b2c577: Merge "Conditionally use SIGSTKFLT"

* commit '63b2c577526d0c7ae4e90e54bf0f0befb0294456':
  Conditionally use SIGSTKFLT