scope name; comments: regex multiline, func inline; regex groups; bug fixes
Merge remote-tracking branch 'upstream/master'