Update config from develop

This commit is contained in:
Automated Commit 2016-10-20 13:15:06 -04:00
parent 40ad622df4
commit f544af0a82

@ -1 +1 @@
Subproject commit 10b814f19be5006ee79579c746a16ea21f34f28c
Subproject commit ba60de800cc53e4209d587c0803bf9d8d8929020