Apply patch-2353967-9
Merge pull request #223 from jmolivas/patch-2353967-9

Apply patch-2353967-9