Incorporate changes made to original source (but not checked in)