Merge jdong branch

Benjamin Mako Hill || Want to submit a patch?