Attempt to fix builds
Merge branch 'es' into 938222
Fix import and method call preventing the build script from succeeding
Merge branch 'fix-various-build-errors' into 938222

Conflicts:
	dxr/plugins/omniglot.py