Merge pull request #2252 from stweil/lgtm