Milestone 1.0.50

Pulling all the work back into master in preparation for deployment.