Patch to follow.
Created attachment 186628 [details] Patch
Created attachment 186629 [details] screenshot
*** This bug has been marked as a duplicate of bug 110334 ***
Comment on attachment 186628 [details] Patch Clearing r? as this was fixed in another bug.