Merge upstream

This commit is contained in:
Shane Freeder 2018-11-24 17:05:29 +00:00
parent e3e6521502
commit 6a94deed65
No known key found for this signature in database
GPG Key ID: A3F61EA5A085289C

@ -1 +1 @@
Subproject commit c26705e6b13a011aa28bd6946740b09f7da9057b
Subproject commit b0737ba230f50e489aa4d4b60ebe162ca94685d4