Merging push-updates into Production

I think we should be ready to deploy DDS v2.5 once we prep the WordPress server with our changes. Step one of that would be merging these two branches. I'll leave it up to @EdHurtig to do the actual merge (i.e. approve this PR), since he will have the best idea of what's going to break :grin: