- Fixed (clang') -Woverloaded-virtual warnings
Merge remote-tracking branch 'upstream/master'