note 46 of redmiine 8383.
Merge remote-tracking branch upstream/$:{upbranch}