Just a merge for future meme update(don't touch)

Merge from tauceti develop branch.