Upstream feature additions

This commit is contained in:
Rob L 2016-08-02 13:23:06 -04:00
parent c0644e3ad6
commit 9ec7407bb4

@ -1 +1 @@
Subproject commit 8d2788b3188d8f91b18ce2c6393e2a98660ab9f9
Subproject commit 3b0559efe21d33f15d0d4fb0ad2449f102715f56