Merge pull request #1 from bryanhirsch/7.x-2.x