OASIS 1.5.1.7

Changes since: OASIS 1.5.1.6

FIX - DaVinci wildcard matching broken