Resolves installation error on some web servers
Merge branch 'step-6-using-the-database' into step-8-adding-language-management