Merge upstream changes from v0.11

Dduvall requested to merge v0.11 into wmf/v0.11

Merging changes from the latest upstream v0.11 branch into wmf/v0.11.

Merge request reports