Merge "Fix various type and reference issues"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Sat, 23 Nov 2013 20:46:36 +0000 (20:46 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Sat, 23 Nov 2013 20:46:36 +0000 (20:46 +0000)

Trivial merge