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

* commit '1d22e943061b24fba5fff74434abf09fb3dda3d1':
  Make Join support string delimiters