manual merge of tripzero/master