Updates through dbb323a (Nov 12th)