Use mac selenium server for dev and beta.
Merge origin/master