This shouldn't be here.
Merge pull request #83 from ruebot/7.x

This shouldn't be here.