Merging Canvox's patch 

Actually merging into the right branch, now. Whew.