Patch coming.
Created attachment 28961 [details] patch
Comment on attachment 28961 [details] patch Cameron Zwarich reviewed this.
Committed revision 41998.