Merge branch 'testing' of https://github.com/mozilla/dxr into pure-virtual