Upstream merge 5c147013ebf04e0ae5324b41a652878b256babc6..bdd1a73eaa0978ca33722a38f707c7c1599773fa
Merge pull request #1416 from Wikia/VE-upstream-merge

Upstream merge 5c14701..bdd1a73