Merge remote-tracking branch 'mfischer/slang' into next