Make sure method-name regex starts on a word-boundary to prevent false-matches.
Merge branch 'develop'