Update config from develop

This commit is contained in:
Automated Commit 2017-10-29 17:15:07 +00:00
parent c85708b5fa
commit 7716695176

@ -1 +1 @@
Subproject commit 644073bcf79b863814b5b21b4bad342e0222089d
Subproject commit 74ef9af25a8b68d738f77f4e1ccf8c1fe476029f