Adria, could you cherry-pick this into 1.8: https://github.com/okfn/ckan/commit/e97b5c70e9325a1095778fef8e0d27c84e881b30 or are you happy for us to do these ourselves?