Update logic from develop

This commit is contained in:
Automated Commit 2017-04-24 17:00:05 +00:00
parent a40a55a6cf
commit 11462c0fb9

@ -1 +1 @@
Subproject commit 45b45781108c949d97cfd491753e74f54c9b9436
Subproject commit 3233579d46ae791a2f27cc33e0600d7ee2ccfd70