Fix for breakage in coffee 1.7

Seems regexp "//" no longer valid
Merge branch 'master' into release