Merge pull request #1913 from RavuAlHemio/bug31635