Please add a comment that this has been merged upstream; if there's a link to a commit or mailing list post, please add that URL in a comment as well. Thanks.