2.1.1
Merge branch 'master', remote branch 'origin'

* origin:
  Fixed broken `venus demo` command
  Doc updates for annotations, CLI flags, and environments

* master: