Blagh
auto merge of #16 : basho/CI_test/pr-4, r=reiddraper