Merge "Bug 1380 - Fix NullPointerException when match is null"