Merge upstream

This commit is contained in:
Jamie Mansfield 2016-12-04 01:11:07 +00:00
parent 5e0e224df5
commit 3a62539bb1
No known key found for this signature in database
GPG Key ID: 27F6918C0D47DF94

@ -1 +1 @@
Subproject commit ea6680281f3b20f4f1dcab44c51b4640c27f357c
Subproject commit 71b00d644fa503d3b7d84b4cc43fdcb4bffc7944