Update to Cilantro 2.1.6 to fix export behavior
Merge branch 'master' into demo