fix gcc warning
Merge remote-tracking branch upstream/$:{upbranch}