Merge pull request #3927 from JonnyTischbein/master