Fix some warnings.
Merge remote-tracking branch 'upstream/master' into features_loop_recorder