Merge pull request #2339 from Marqin/master