Merge pull request #4154 from hardening/misc_fixes
authorakallabeth <akallabeth@users.noreply.github.com>
Wed, 27 Sep 2017 12:56:21 +0000 (14:56 +0200)
committerGitHub <noreply@github.com>
Wed, 27 Sep 2017 12:56:21 +0000 (14:56 +0200)
Fix raw surfaces displaying + misc other changes


Trivial merge