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