Merge branches 'skin', 'quantize' and 'slip' into xorik