ticket:9 getbarista workaround
Merge branch 't9_commands' into t10_receiver