Merge pull request #3252 from rubenk/lgtm