Merge "keep methods' name/docstring after decorator"