Merge with Redis 2.6.16 to obtain latest fixes.
Additionally, merge with latest changes for async SSL in ssl-redis 2.4