Merge upstream

This commit is contained in:
Jamie Mansfield 2016-12-06 18:28:40 +00:00
parent ea2c109864
commit 692af3b22e
No known key found for this signature in database
GPG Key ID: 27F6918C0D47DF94

@ -1 +1 @@
Subproject commit 71b00d644fa503d3b7d84b4cc43fdcb4bffc7944
Subproject commit 3ee7fdd90eb7b79e3e0049789a111324acfe6454