Merged the ckan-ja branch