Merge pull request #1 from DGI-City-Of-Hope/6.x

6.x changes from COH