Oops, seems like I broke captions
Merge branch 'master' of github.com:guardian/frontend

Conflicts:
	article/test/ArticleFeatureTest.scala
Merge branch 'master' of github.com:guardian/frontend

Conflicts:
	article/test/ArticleFeatureTest.scala