CFLM defusses VIBR, a few speed improvements to VIBR
Merge remote-tracking branch 'origin/master'