Committed to trunk in r24604 (associated with issue #6323).