Merge pull request #910 from tobiasd/20191106-lng