Hopefully fixes the double push bug.
Merge pull request #5019 from Zuhayr/dev

Emergency fix.