Merge pull request #2019 from boqwxp/glift