Re-apply the patch cb1b466c, the change disappeared after the merge
Attach a file by drag & drop or click to upload
