Merge pull request #1583 from lytboris/v3.0.x