prune KeyError
Merge branch 'master' into deployment/production