Merge "Exception rendering fixes"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Sun, 2 Oct 2016 00:24:36 +0000 (00:24 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Sun, 2 Oct 2016 00:24:36 +0000 (00:24 +0000)

Trivial merge