merge rgrp/ckan-explorer HEAD into marks/ckan-explorer master