Merge "Include server in redis lua errors"