Merge branch 'master' of github.com:guardian/frontend
Fix merge conflict
Fix merge conflicts
Fix merge conflicts with image tests