Merge selenium branch with master;