Merge branch '1.3' into eas-1.3.2-to-master

Conflicts:
	rebar.config
	src/riak_kv_app.erl
	src/riak_kv_util.erl
	test/ec_eqc.erl