Revert "Revert "Merge master and rebuild.""

This reverts commit 03e0afc58aa6a99dc0a629efe2e607ea1e416fbf.

Turns out Selenium tests cannot be run from pull request builds. :/