Comment 36 for bug 1202952

Correction on post #33/#34, the patch is based upon the Folsom patch in post #28.