Merged in changes from the other main branch.

Benjamin Mako Hill || Want to submit a patch?