merged changes back from live

Benjamin Mako Hill || Want to submit a patch?