Move on
Fix block identation
Merge branch 'master' into loopless

Conflicts:
	tests/zmq_events_test.py
Test pause reading