Avoiding spurious contract function name matches.
Merge branch 'develop' into svcomp2015