am 399c59f3: am d5deac8d: Merge "Add _(darwin|linux|windows)"

* commit '399c59f3aa3b7f025a8ec5b0b60af402f9954142':
  Add _(darwin|linux|windows)