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

repackaged