Merge pull request #4121 from ondrejholy/setsurface-segfault-fix
authorDavid Fort <rdp.effort@gmail.com>
Mon, 18 Sep 2017 08:17:43 +0000 (10:17 +0200)
committerGitHub <noreply@github.com>
Mon, 18 Sep 2017 08:17:43 +0000 (10:17 +0200)
Various fixes from #4117


Trivial merge