This repository was archived by the owner on Mar 25, 2018. It is now read-only.

Patch 2.4 branch with revisions 5643 and 5636.  This fixes a problem …