Patch to follow.
Created attachment 206219 [details] Patch
*** This bug has been marked as a duplicate of bug 118441 ***
Comment on attachment 206219 [details] Patch Looks good
Comment on attachment 206219 [details] Patch Clearing the review and commit-queue flags.