Merge "No longer using std::unary_function<>." into devel/master