Merged with branch riak-client-1.4.2