Comment 29 for bug 978896

FYI, this patch applies cleanly to the stable/essex branch and passes the unit tests (including the included unit test that verifies this issue). It should be good-to-go for backport.