Merge pull request #2731 from Phyyl/master