Local changes?
Merge pull request #2 from DGI-City-Of-Hope/6.x

Local changes?