Comment 52 for bug 1202952

+2 for revised patches in comments #48 and #49