sloppy merge of opencobra:master pickles