Upgraded to STS 3.6.1