final CLI reference with Zumo for 1/9 release
fix merge conflict #830
Merge pull request #831 from mollybostic/master_local

fix merge conflict #830