Fix CSI regex
Merge branch 'master' into uncodin