Handle partial matches (added in regex 2014.04.10)
Merge branch 'master' into events