Merge branch 'master' into adsk-contrib-fix-std-stream-overflow
authorndotl <haik.lorenz+ndotl@gmail.com>
Wed, 18 Oct 2017 11:41:09 +0000 (13:41 +0200)
committerGitHub <noreply@github.com>
Wed, 18 Oct 2017 11:41:09 +0000 (13:41 +0200)

Trivial merge