# This is a combination of 4 commits.
# The first commit's message is:
WIP for issue 682

# The 2nd commit message will be skipped:

#	Updated parameters and channel command based on feedback from markh

# The 3rd commit message will be skipped:

#	cancel -> ok in return value

# The 4th commit message will be skipped:

#	merge conflicts