a
Merge remote-tracking branch 'github/master'
a
a
Merge remote-tracking branch 'github/master'

Conflicts:
	zmq_btce/btce_sink.py
a