removed named capture to be compatible with Ruby 1.8
Merge branch 'v1' into v2
Merge remote-tracking branch 'upstream/v2' into v2