Fixes ticket #12. Merged r3170:HEAD from