Changes for CKAN-core/#41