Patch coming.
Created attachment 23834 [details] patch
Comment on attachment 23834 [details] patch r=me
Committed revision 36972.