am: 8ef74534 -s ours * commit '8ef74534': [NAN] Expose match style configuration as public API. [DO NOT MERGE]