Apply patch from datagovuk repository
Merge pull request #422 from ratajczak/master

Apply patch from datagovuk repository