Update config from develop

This commit is contained in:
Automated Commit 2017-08-25 19:00:07 +00:00
parent a5389bfab1
commit 5db72b2746

@ -1 +1 @@
Subproject commit a7dd324d41473830d1750ce39a0415a787db824a
Subproject commit f6c3a163f0d654cd7d88a3f9667bb056eabff38a