Update build.
Merge pull request #973 from sylus/7.x-1.x

Update build.