Merged with master, complete with all my latest updates.