Merge pull request #1588 from oskar456/gitfix