Merged the accepted upstream patches.