Update to Cilantro 2.2.0 beta
Merge branch 'master' into demo