Fixes #2916 -- implicit calls with preceding herecomment
Merge remote-tracking branch 'refs/remotes/upstream/master'
Merge pull request #2933 from marchaefner/master

Fix implicit calls with preceding herecomment