Patch to be posted soon.
Created attachment 14304 [details] Patch
Comment on attachment 14304 [details] Patch Hurray!
Landed in r21219.