Support underscore >= 1.1.7 (when intersect was renamed to intersection)
Merge branch 'master' into validation-only

* master:
  Support underscore >= 1.1.7 (when intersect was renamed to intersection)