Skip test_floodfill_border() on PyPy to avoid fatal error
Fix a its/it's incorrect usage
Merge pull request #696 from Smashman/patch-1

Fix a its/it's incorrect usage
Merge pull request #694 from hugovk/floodfill

Skip test_floodfill_border() on PyPy to avoid fatal error
Merge remote-tracking branch 'upstream/master' into unittest1merge

Conflicts:
	Tests/test_imagedraw.py