Merge 1.4.2 to develop

Conflicts:
	rebar.config
	src/riak_client.erl