Merged basho/riak_kv#594 into rz-yz-merge-1.4.0 branch. Should be good to go in the near term