am 104c694d: Merge "Mark scripts as threadable or not"

* commit '104c694d67a224adda7b673de04b763bc63d6c3f':
  Mark scripts as threadable or not