pushing changes upstream into the project
Merge pull request #286 from vhalbert/8.7.x

pushing changes upstream into the project