Baz
auto merge of #14 : basho/CI_test/pr-2, r=reiddraper