Merge commit 'origin/next' into branch-2.1

Conflicts:
	lib/cli.py: trivial extra empty line

diff --cc lib/cli.py
Simple merge

diff --cc lib/constants.py
Simple merge

diff --cc lib/jqueue.py
Simple merge

diff --cc lib/rpc.py
Simple merge