Update functional from develop

This commit is contained in:
Automated Commit 2018-04-15 21:30:06 +00:00
parent 053fc49fc5
commit 00b783b394

@ -1 +1 @@
Subproject commit b0cd91e1540ba961c34ee4671594af8f5ae03a2f
Subproject commit 39de410228ccd7cddc5aceb11abcf8ff9a7d0bba