I think you resolved a merge conflict incorrectly. "versionchanged:: 1.5" annotations have been removed in master.