Merge pull request #1917 from Xavrir/issue-1900