Adjust mirror branch to merge from upstream master also.
[ci skip]