4ec3361 Import fix for target/pr61545 from the 4.9 branch.

2 files Authored by Richard Henderson 9 years ago, Committed by Kyle McMartin 9 years ago,
    Import fix for target/pr61545 from the 4.9 branch.
    
        
file modified
+6 -1
file added
+10