Merge "Make Join support string delimiters"
am: 46776e7423

* commit '46776e7423c9a4a7ed5f52def545feee4c31297c':
  Make Join support string delimiters