auto merge of #2 : basho/CI_test/adt-fix-test, r=Vagabond
Hello