Sync with py.test 3896:1d2fa202e54c
Merge branch 'pytest'

Conflicts:
	.gitignore