Update logic from develop

This commit is contained in:
Automated Commit 2019-05-02 01:15:03 +00:00
parent 5455401400
commit a97dd6a489

@ -1 +1 @@
Subproject commit 3a9110fc34ff0248062c83466fcfae0bc0a113c1
Subproject commit 4c26c6ee3f0b2c386f451849f8bb43a5b46be999