Merge of branches MacMini inside Master