Upstream fixes

This commit is contained in:
Rob L 2016-07-29 12:49:30 -04:00
parent 9e4e1a6d49
commit 9e6a687564

@ -1 +1 @@
Subproject commit 1d683f6a3a33d1ed4287826c2735c64ad15f9a56
Subproject commit 4175e58b9b8405c6e0ecc7a0d8d5beeb34ab68ed