*correctly* merge stomp.py-4.0 branch