I'll merge this since there is an outage and this will fix it.
Pull-Request has been merged by mprahl