Merge #10395: Replace boost::function with std::function (C++11)