Bar
auto merge of #13 : basho/CI_test/pr-1, r=reiddraper