wukkuan Merge ST3 branch.
Latest commit 1a1992c Sep 1, 2013