Merge "Replace use of functools.wraps() with six.wraps()"