Merge from central repo into bryhoyt's fork