Further updates from upstream

This commit is contained in:
Robert L 2018-01-09 10:34:15 -05:00
parent 34df287645
commit 980663ef3a

@ -1 +1 @@
Subproject commit 4f526b39c60fd9148ef845e7ffe6d12db5a38a4a Subproject commit eb13a474635976870b59439e3278fc4ada264038