I'm confused by this pull-request, it only contains my commits and conflicts with the current branch.

If this is only a rebased of the py3_work branch, I'm already on it but the tests aren't passing on my F23 so I'm fixing this before I push the rebased branch.

I'm going to close this pull-request, I've managed to get all the tests passing on py2 and py3 locally so I'll update my branch and since I only see commits from me in this PR I don't think my branch will be lacking.

If I am missing fixes from this branch in mine, please submit then but as separate commits.

Thanks ! :)