Merge pull request #1375 from rubenk/redis-unlock-lock