Merge branch 'release/2.7.2.1'
Ensure that users of Python mock's patch function an use the factory
methods interchangeably, with kwargs.

Either:

    @patch('redis.Redis', mock_redis_client)

Or:

    @patch('redis.StrictRedis', mock_strict_redis_client)
Merge branch 'hotfix/2.7.2.1.1' into develop

Conflicts:
	setup.py