ed509f8
Pull in new upstream changes * Also regenerate existing patches so that they are in same order as in upstream repository.