Merging w/ remote branch
Merging w/ remote branch

biddyweb/riak,elkingtonmcb/riak,planobe/riak,xuejianhai/riak,xuejianhai/riak_search,planobe/riak,wwezhuimeng/riak_search,basho/riak_search,basho/riak_search,xuejianhai/riak_search,authbox-lib/riak,DavidAlphaFox/riak,laurenrother/riak,amyvmiwei/riak,glickbot/riak,GabrielNicolasAvellaneda/riak,yangchengjian/riak,basho/riak,wwezhuimeng/riak_search