Merge branch 'search_regex' - PR #872 - closes #847