Merged changes from jdong's branch into HEAD.

Benjamin Mako Hill || Want to submit a patch?