wip/riak14/patches
