Merge "browser acceptance tests"