Derp.
Merge pull request #5012 from Zuhayr/dev

Derp.