Merge changes from Lyle's repository back into mine