Merge pull request #6664 from tobiasd/20190216-lng