Merge latest to master, in preparation for deleting the staging branch.

[bwinton]

(Let's just get this in, and then I'm going to re-do the branch structure to develop on master, and have production be its own branch.)