Comment 13 for bug 1386347

Thanks for the sign-offs, Mike. I've merged the code to master (2.8-beta). I did not merge to 2.7/2.6, pending thumbs up or down from RM's. Since this one is in a gray area and there's no outcry to have it back-ported, I'm personally leaning toward not back-porting.