Merge pull request #868 from sylus/7.x-1.x