Support ST2.
Merge pull request #2891 from CasperLaiTW/master

Support ST2.
fix trailing slash
Merge remote-tracking branch 'wbond/master'