Updates through 86b2b86 (Nov. 1st)