moved from underscore to lodash
Merge branch 'master' into gh-pages