Merge pull request #44 from wardi/canada-v2.1

organization_show: backport datasets from solr, add include_datasets option
duplicate extras save workardound