fixes: #876
:thumbsup:
looks ok. Eventually, we'll need to really clean up this cli handler.
+1, let's discuss this clean-up in #916 with other related issues
Commit 2a505f59 fixes this pull-request
Pull-Request has been merged by mikem
fixes: #876