Merge upstream

This commit is contained in:
Jamie Mansfield 2018-07-13 00:03:16 +01:00
parent a40c225a66
commit 8d79956adc
No known key found for this signature in database
GPG Key ID: 27F6918C0D47DF94

@ -1 +1 @@
Subproject commit fa542c70df4c797be510bfd36327181348f0f2bf
Subproject commit ceb9ea1e52b0391a824a3a87c3e07e6db9ca178b