Merge from jdong; all testcases should succeed at this point, and all deprecations...

Benjamin Mako Hill || Want to submit a patch?