Fixed some warnings.
Merge remote-tracking branch 'remotes/upstream/master'