upgrade to 2.2#21

asyasmi merged 7 commits into

maincoherence/campfire-tutorial:mainfrom

developmentcoherence/campfire-tutorial:developmentCopy head branch name to clipboard