Catch up with riak-python-client trunk