Merge "Use file width/height instead of metadata for getContentHeaders" into wmf...
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 24 May 2017 18:36:01 +0000 (18:36 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 24 May 2017 18:36:02 +0000 (18:36 +0000)

Trivial merge