Merge "Remove use of std::unary_function and std::binary_function"