Quz
auto merge of #15 : basho/CI_test/pr-3, r=reiddraper