Merge ericwhyne changes