Upstream fixes

This commit is contained in:
Robert Levesque 2016-08-21 15:06:18 -04:00
parent c35eb56628
commit 6371bc363d

@ -1 +1 @@
Subproject commit fa35c6e1eb56e77d58fc817fd2323a536397f04b Subproject commit f7afcdeb66db9abf55bd3d601f6910c14d382b91