Update function from develop

This commit is contained in:
Automated Commit 2017-07-08 05:15:06 +00:00
parent a073e75f7b
commit cac7db2db2

@ -1 +1 @@
Subproject commit 9096849ef0b2537df49248182bb8489072a00512
Subproject commit 1938737ee76f6b6bc8f78f084d8289c999d8c793