Merge pull request #2578 from akrynski:patch-1