diff --git a/AUTHORS b/AUTHORS
index 8d700878c..0b0f10052 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -51,6 +51,7 @@ Marc Schlaich
 Mark Abramowitz
 Markus Unterwaditzer
 Martijn Faassen
+Michael Droettboom
 Nicolas Delaby
 Pieter Mulder
 Piotr Banaszkiewicz
diff --git a/CHANGELOG b/CHANGELOG
index a304476c4..aed656182 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -12,6 +12,9 @@
   to passing "fEsxXw" explicitly (isse960).
   Thanks Abhijeet Kasurde for the PR.
 
+- avoid python3.5 deprecation warnings by introducing version
+  specific inspection helpers, thanks Michael Droettboom.
+
 - fix issue562: @nose.tools.istest now fully respected.
 
 - fix issue934: when string comparison fails and a diff is too large to display
diff --git a/_pytest/__init__.py b/_pytest/__init__.py
index 558539cfe..902ecb382 100644
--- a/_pytest/__init__.py
+++ b/_pytest/__init__.py
@@ -1,2 +1,2 @@
 #
-__version__ = '2.8.0.dev5'
+__version__ = '2.8.0.dev6'
diff --git a/setup.py b/setup.py
index ce54a1d35..8b3d21cdd 100644
--- a/setup.py
+++ b/setup.py
@@ -67,7 +67,7 @@ def main():
         url='http://pytest.org',
         license='MIT license',
         platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'],
-        author='Holger Krekel, Benjamin Peterson, Ronny Pfannschmidt, Floris Bruynooghe and others',
+        author='Holger Krekel, Bruno Oliveira, Ronny Pfannschmidt, Floris Bruynooghe, Brianna Laugher, Florian Bruhin and others',
         author_email='holger at merlinux.eu',
         entry_points=make_entry_points(),
         classifiers=classifiers,