Update function from develop

This commit is contained in:
Automated Commit 2018-11-01 12:45:07 +00:00
parent cc817a3323
commit 1aa1e99164

@ -1 +1 @@
Subproject commit f22fa49e078b1bbef31e2a472135e17847ab578a
Subproject commit 161f7557e706d298879a01aef8ee4dd25e1c4439