Merge pull request #4104 from abma/master
authorDavid Fort <rdp.effort@gmail.com>
Tue, 29 Aug 2017 09:06:13 +0000 (11:06 +0200)
committerGitHub <noreply@github.com>
Tue, 29 Aug 2017 09:06:13 +0000 (11:06 +0200)
Revert "Possible fix for #4081 and #2707 (#4087)" (Part of #4096)


Trivial merge