repackaged
Merge pull request #1 from ajstanley/7.x

repackaged