-Fixed bug with ambiguous match during internal unit tests
Merge remote-tracking branch 'upstream/master'