Don Porter - 2013-04-10

See branch bug-3608714.

Surprising thing is that the test suite does not care.