Fix use of local variables with self-assign operators
Fix bad regexp
Merge pull request #602 from pgaultier/fix/badRegexp

Fix bad regexp
Merge remote-tracking branch 'upstream/master' into w32