Merge pull request #2337 from reaperhulk/py35-and-pypy

Python 3.5 support