fix two trivial compiler warnings
Merge remote-tracking branch 'origin/7.34' into 7.34