Merged in dandelany's copyedits