Merge pull request #1 from evkennedy/v7.x.1.0

v7.x-1.0d