WIP merge of master into cobbler