Checking in the Trunk version of 2.9.3 build 313