Merge branch 'master' into fix_windows_unittests

This commit is contained in:
Stephen Sadowski 2018-10-01 10:10:48 -05:00 committed by GitHub
commit 7a9e100b0f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23