Fix issue #2220
Merge pull request #275 from jtraulle/branch-32

Fix issue #2220