Merged r10875:10880 from jcorgan/t161 into trunk. Implements ticket:161, allowing...