Making this an issue rather than a pull request because you undoubtedly have some local changes so it'll be easier for you to integrate.