Riak 1.4

Merge fixes from 1.4