DATASET-1012: Limit match to avoid 9.2.8 dependency.
Merge branch 'joyent/feature/miscfix/2013Q3' into joyent/release/2013Q3