Merge of opencobra / master