Merge branches 'skin', 'nml-export', 'quantize' and 'slip' into xorik