Merge pull request #3341 from 9rnsr/master

Fix broken master