Merge ST3 to master

Woot!