Merge pull request #877 from tobiasd/20190808-lng