Merge pull request #1946 from korzhyk/web_home