redis -> gist
Merge develop into master