Update this change that was found on ray stone's website. Noah said it was good to push up ;)
Merge remote-tracking branch 'origin/7.x-1.x' into 7.x-1.x