Merged r7001:7035 from jcorgan/t202 into trunk. Implements ticket:202, converting...