Bug 903115: Many context-menu tests timeout on tinderbox.
Merge pull request #1160 from Mossop/bug903115

Bug 903115: Many context-menu tests timeout on tinderbox. r=jsantell