Merge upstream

This commit is contained in:
Jamie Mansfield 2017-11-18 18:22:53 +00:00
parent 66dbf93bab
commit 42bc9c39a9
No known key found for this signature in database
GPG Key ID: 27F6918C0D47DF94

@ -1 +1 @@
Subproject commit cccbb3c889d7d9b5aaacfc5d5d3062bd0d660284
Subproject commit 4c84f37fd23dfd67e4fee5dfd7cb62d67791129f