Commits
Neil Fortner committed c36a79fd912
[svn-r21631] Port revisions 21629 and 21630 to 1.8 branch Purpose: Update fix committed in r21556 Description: An old patch was mistakenly committed in r21556. Replaced this fix with the latest. Tested: jam, koala, heiwa (h5committest)