Merge pull request #2644 from valunf/patch-1