pull changes to satisfy clang warning