Merge branch 'master' into msvc2013_tempfile_fix
authorKim Kulling <kimkulling@users.noreply.github.com>
Sun, 8 Oct 2017 17:53:53 +0000 (19:53 +0200)
committerGitHub <noreply@github.com>
Sun, 8 Oct 2017 17:53:53 +0000 (19:53 +0200)

Trivial merge