bring @marks:1251-resource-view fork up to date with @ckan:1251-resource-view