[nss/f13/master] (4 commits) ...Merge branch 'f14' into f13

[Elio Maldonado]

Summary of changes:

  125ad15... Fixes for Bugs 636787, 636792, 636801, and 609612 (*)
  c7e7247... Improve on fixes for bugs #636787, #636792, and #636801 (*)
  a3c3243... Improve on fixes for bugs #636787, #636792, and #636801
  98913cd... Merge branch 'f14' into f13

(*) This commit already existed in another branch; no separate mail sent