Cliff now spawns
Merge remote-tracking branch 'origin/leif'