Merge upstream. Fixes #104

This commit is contained in:
Jamie Mansfield 2016-12-01 16:12:28 +00:00
parent ca691eba5e
commit a1e6856f62
No known key found for this signature in database
GPG Key ID: 27F6918C0D47DF94

@ -1 +1 @@
Subproject commit 4d004d5fed51e6fb8ef9ce6f970d73186371078a
Subproject commit ea6680281f3b20f4f1dcab44c51b4640c27f357c