Final merge into deployment in prep for tagged 1.0 release.