fix syntax error in GetFunctionLocation()
Make the context mangling regexp less prone to backtraces
Improve classname detection

When using namespaces after new keyword or the getInstance() the namespace
in the class name was not considered to be the namespace for the returned
object
Fix context mangling

The bf60a31e version was too greedy
Merge branch 'master' into my-develop