Pulling in commits from master to dev

The master branch has evolved, and we want to start working on contributions from sites in the dev branch.