Merge pull request #529 from Wikia/lox-bugid-99840

LGTM