Update config from develop

This commit is contained in:
Automated Commit 2017-08-22 18:00:05 +00:00
parent 6dfe109470
commit bc8b3d207a

@ -1 +1 @@
Subproject commit 011426d510e66bb1e1825b7046c1d3c56f513ba1
Subproject commit a7dd324d41473830d1750ce39a0415a787db824a