Update config from develop

This commit is contained in:
Automated Commit 2018-11-02 14:00:09 +00:00
parent 04b2ac548f
commit 33ad2ec751

@ -1 +1 @@
Subproject commit ce370332cee9182e1bbad67c02c2257ad3720528
Subproject commit 96d0bce5f1ea1902bad2bec04193278d219922bb