Merge upstream

This commit is contained in:
Jamie Mansfield 2016-11-15 22:45:30 +00:00
parent 9fb1a1f574
commit 04e241d472
No known key found for this signature in database
GPG Key ID: 27F6918C0D47DF94

@ -1 +1 @@
Subproject commit f3e5f34aebc23f07d9605e177ed33c6c2d0af1f7
Subproject commit 8574688be7512040fa2c75e101ee6f17e5444e6b