Fixed warnings
Merge remote-tracking branch 'upstream/master'
Resolved merge conflicts