wip/riak/patches
