Update logic from develop

This commit is contained in:
Automated Commit 2018-11-04 02:00:05 +00:00
parent 1391fae398
commit 4ca457a732

@ -1 +1 @@
Subproject commit c305a4a1e4ebf8f9d516d2e7f6737261602b42a7
Subproject commit fd021e5eb747eaa77c94720ef1ea17e7e73911ae