Merge pull request #2580 from ItsVeryWindy/master