Summary of changes: b98f207... add patch comments. (*) c6e80d0... pull upstream patch r1392850 in addition to r1387633 (*) (*) This commit already existed in another branch; no separate mail sent