Fixing UI tests build.
Merge branch 'master' into travis_playground